From 6f9364eceba8ce6db737d26cd15ec4a91a03ca27 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Mon, 10 Sep 2007 12:46:23 +0000 Subject: [PATCH] when creating a new box, be sure to transfer a possible tooltip from the 2007-09-10 Kristian Rietveld * gtk/gtkmenutoolbutton.c (gtk_menu_tool_button_construct_contents): when creating a new box, be sure to transfer a possible tooltip from the old to the new box. (Fixes #458283, reported by Christian Persch). svn path=/trunk/; revision=18785 --- ChangeLog | 6 ++++++ gtk/gtkmenutoolbutton.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8b6806e19c..61d830d644 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-10 Kristian Rietveld + + * gtk/gtkmenutoolbutton.c (gtk_menu_tool_button_construct_contents): + when creating a new box, be sure to transfer a possible tooltip from + the old to the new box. (Fixes #458283, reported by Christian Persch). + 2007-09-10 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_key_press): only start diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 8b20766871..8d7f611ea5 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -106,6 +106,17 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button) if (priv->box) { + gchar *tmp; + + /* Transfer a possible tooltip to the new box */ + g_object_get (priv->box, "tooltip-markup", &tmp, NULL); + + if (tmp) + { + g_object_set (box, "tooltip-markup", tmp, NULL); + g_free (tmp); + } + /* Note: we are not destroying the button and the arrow_button * here because they were removed from their container above */ -- 2.30.2